Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organize stereospecific Figure #36

Merged
merged 1 commit into from
May 12, 2015
Merged

Conversation

HubLot
Copy link
Member

@HubLot HubLot commented May 11, 2015

To continue the organization of the repo (#15 #17), here the part for the "stereospecificOPs.pdf" figure.
I hope to do it also for the last 3 figures (cholesterolization_X.pdf once it's decided, comparisonSorted.pdf & dehydration.pdf)

What I did:
Gnuplot script (gpl) and pdf output have been move the Fig folder.
A Makefile entry has been made to reproduce the figure
The tex source has been update with the new location

@ohsOllila
Copy link
Member

Sorry Hubert, we made some other changes before accepting this pull request and now there are conflicts. Probably the only reason is the one line change in HGmodel_ACStemplate.tex. Would it be easy for you make a new pull request with essentially the same content with the most recent files? I have not learned to resolve these conflicts yet.

@HubLot
Copy link
Member Author

HubLot commented May 12, 2015

I'm on it

Gnuplot script (gpl) and pdf output have been move the Fig folder.
A Makefile entry has been made to reproduce the figure
The tex source has been update with the new location
@HubLot
Copy link
Member Author

HubLot commented May 12, 2015

Okay, the confict is gone. It was due to the fact we update the pdf in our side separately and Github cannot merge binary files (hence the conflict)
The important thing is that no source files was in conflict.
To be sure, can you double-check the pdf before merging?

ohsOllila added a commit that referenced this pull request May 12, 2015
Organize stereospecific Figure
@ohsOllila ohsOllila merged commit 0cacde6 into NMRLipids:master May 12, 2015
@HubLot HubLot deleted the Fig_stereo branch May 12, 2015 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants